From e3a281be135337924f50c829bf418895f64e97f8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 11 Aug 2014 21:56:12 +0200 Subject: [PATCH] scrolledwindow: Make kinetic scrolling only work on touch devices This code was relying on the previous GtkGestureSingle::touch-only default value, so restore the behavior back. https://bugzilla.gnome.org/show_bug.cgi?id=734285 --- gtk/gtkscrolledwindow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 81be46bfac..fd090cb0d0 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -761,7 +761,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) priv->min_content_height = -1; priv->drag_gesture = gtk_gesture_drag_new (widget); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->drag_gesture), 1); + gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture), TRUE); g_signal_connect_swapped (priv->drag_gesture, "drag-begin", G_CALLBACK (scrolled_window_drag_begin_cb), scrolled_window); @@ -774,17 +774,17 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) priv->pan_gesture = gtk_gesture_pan_new (widget, GTK_ORIENTATION_VERTICAL); gtk_gesture_group (priv->pan_gesture, priv->drag_gesture); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->pan_gesture), 1); + gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->pan_gesture), TRUE); priv->swipe_gesture = gtk_gesture_swipe_new (widget); gtk_gesture_group (priv->swipe_gesture, priv->drag_gesture); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->swipe_gesture), 1); + gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->swipe_gesture), TRUE); g_signal_connect_swapped (priv->swipe_gesture, "swipe", G_CALLBACK (scrolled_window_swipe_cb), scrolled_window); priv->long_press_gesture = gtk_gesture_long_press_new (widget); gtk_gesture_group (priv->long_press_gesture, priv->drag_gesture); - gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->long_press_gesture), 1); + gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->long_press_gesture), TRUE); g_signal_connect_swapped (priv->long_press_gesture, "pressed", G_CALLBACK (scrolled_window_long_press_cb), scrolled_window); -- 2.30.2